From b6ddced3214c8d8e46955df598ae903230ebbe69 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild2.aw" Date: Wed, 10 Jan 2007 10:35:24 -0700 Subject: [PATCH] [IA64] Move cmdline.c to linux-xen Need to clean up some build warnings. Probably should have been moved last time it was modified. Signed-off-by: Alex Williamson --- xen/arch/ia64/linux-xen/Makefile | 1 + xen/arch/ia64/linux-xen/README.origin | 1 + xen/arch/ia64/{linux => linux-xen}/cmdline.c | 0 xen/arch/ia64/linux/Makefile | 1 - xen/arch/ia64/linux/README.origin | 1 - 5 files changed, 2 insertions(+), 2 deletions(-) rename xen/arch/ia64/{linux => linux-xen}/cmdline.c (100%) diff --git a/xen/arch/ia64/linux-xen/Makefile b/xen/arch/ia64/linux-xen/Makefile index 182cc8ebbf..f4ee8c396b 100644 --- a/xen/arch/ia64/linux-xen/Makefile +++ b/xen/arch/ia64/linux-xen/Makefile @@ -1,5 +1,6 @@ subdir-y += sn +obj-y += cmdline.o obj-y += efi.o obj-y += entry.o obj-y += irq_ia64.o diff --git a/xen/arch/ia64/linux-xen/README.origin b/xen/arch/ia64/linux-xen/README.origin index e667b05603..bfc3981e15 100644 --- a/xen/arch/ia64/linux-xen/README.origin +++ b/xen/arch/ia64/linux-xen/README.origin @@ -5,6 +5,7 @@ # (e.g. with #ifdef XEN or XEN in a comment) so that they can be # easily updated to future versions of the corresponding Linux files. +cmdline.c -> linux/lib/cmdline.c efi.c -> linux/arch/ia64/kernel/efi.c entry.h -> linux/arch/ia64/kernel/entry.h entry.S -> linux/arch/ia64/kernel/entry.S diff --git a/xen/arch/ia64/linux/cmdline.c b/xen/arch/ia64/linux-xen/cmdline.c similarity index 100% rename from xen/arch/ia64/linux/cmdline.c rename to xen/arch/ia64/linux-xen/cmdline.c diff --git a/xen/arch/ia64/linux/Makefile b/xen/arch/ia64/linux/Makefile index 843c849fb9..4e55bcb3a4 100644 --- a/xen/arch/ia64/linux/Makefile +++ b/xen/arch/ia64/linux/Makefile @@ -4,7 +4,6 @@ subdir-y += sn obj-y += bitop.o obj-y += clear_page.o -obj-y += cmdline.o obj-y += copy_page_mck.o obj-y += efi_stub.o obj-y += extable.o diff --git a/xen/arch/ia64/linux/README.origin b/xen/arch/ia64/linux/README.origin index 9706a53502..f5f4677115 100644 --- a/xen/arch/ia64/linux/README.origin +++ b/xen/arch/ia64/linux/README.origin @@ -4,7 +4,6 @@ NOTE: DO NOT commit changes to these files! If a file needs to be changed, move it to ../linux-xen and follow the instructions in the README there. -cmdline.c -> linux/lib/cmdline.c efi_stub.S -> linux/arch/ia64/kernel/efi_stub.S extable.c -> linux/arch/ia64/mm/extable.c hpsim.S -> linux/arch/ia64/hp/sim/hpsim.S -- 2.30.2